diff --git a/include/freerdp/rdpext.h b/include/freerdp/extension.h
similarity index 96%
rename from include/freerdp/rdpext.h
rename to include/freerdp/extension.h
index 113f9264a..733d75a73 100644
--- a/include/freerdp/rdpext.h
+++ b/include/freerdp/extension.h
@@ -17,8 +17,8 @@
  * limitations under the License.
  */
 
-#ifndef __RDPEXT_H
-#define __RDPEXT_H
+#ifndef __RDP_EXTENSION_H
+#define __RDP_EXTENSION_H
 
 #include <freerdp/types/ui.h>
 
@@ -61,4 +61,4 @@ typedef FREERDP_EXTENSION_ENTRY_POINTS * PFREERDP_EXTENSION_ENTRY_POINTS;
 
 typedef int (RDPEXT_CC * PFREERDP_EXTENSION_ENTRY)(PFREERDP_EXTENSION_ENTRY_POINTS pEntryPoints);
 
-#endif
+#endif /* __RDP_EXTENSION_H */
diff --git a/include/freerdp/freerdp.h b/include/freerdp/freerdp.h
index 17627daee..c69771890 100644
--- a/include/freerdp/freerdp.h
+++ b/include/freerdp/freerdp.h
@@ -20,9 +20,9 @@
 #ifndef __FREERDP_H
 #define __FREERDP_H
 
-#include "rdpset.h"
+#include "settings.h"
 #include "types/ui.h"
-#include "rdpext.h"
+#include "extension.h"
 
 #define FREERDP_INTERFACE_VERSION 4
 
@@ -61,7 +61,7 @@ struct rdp_inst
 {
 	int version;
 	int size;
-	rdpSet * settings;
+	rdpSettings * settings;
 	void * rdp;
 	void * param1;
 	void * param2;
@@ -146,7 +146,7 @@ struct rdp_inst
 };
 
 FREERDP_API rdpInst *
-freerdp_new(rdpSet * settings);
+freerdp_new(rdpSettings * settings);
 FREERDP_API void
 freerdp_free(rdpInst * inst);
 
diff --git a/include/freerdp/rdpset.h b/include/freerdp/settings.h
similarity index 95%
rename from include/freerdp/rdpset.h
rename to include/freerdp/settings.h
index a663c2b8a..c3a04f750 100644
--- a/include/freerdp/rdpset.h
+++ b/include/freerdp/settings.h
@@ -17,8 +17,8 @@
  * limitations under the License.
  */
 
-#ifndef __RDPSET_H
-#define __RDPSET_H
+#ifndef __RDP_SETTINGS_H
+#define __RDP_SETTINGS_H
 
 struct rdp_chan
 {
@@ -43,7 +43,7 @@ struct rdp_monitor
 	int is_primary;
 };
 
-struct rdp_set
+struct rdp_settings
 {
 	int width;
 	int height;
@@ -95,4 +95,4 @@ struct rdp_set
 	struct rdp_monitor monitors[16];
 };
 
-#endif /* __RDPSET_H */
+#endif /* __RDP_SETTINGS_H */
diff --git a/include/freerdp/types/ui.h b/include/freerdp/types/ui.h
index cbecf56e2..892eacaf0 100644
--- a/include/freerdp/types/ui.h
+++ b/include/freerdp/types/ui.h
@@ -133,8 +133,8 @@ typedef struct _FRDP_REDRAW_EVENT FRDP_REDRAW_EVENT;
 struct rdp_inst;
 typedef struct rdp_inst rdpInst;
 
-/* defined in include/freerdp/rdpset.h */
-struct rdp_set;
-typedef struct rdp_set rdpSet;
+/* defined in include/freerdp/settings.h */
+struct rdp_settings;
+typedef struct rdp_settings rdpSettings;
 
 #endif
diff --git a/libfreerdp-core/credssp.c b/libfreerdp-core/credssp.c
index fcc043ff2..6097d5483 100644
--- a/libfreerdp-core/credssp.c
+++ b/libfreerdp-core/credssp.c
@@ -30,7 +30,7 @@
 
 #include <time.h>
 #include "ntlmssp.h"
-#include <freerdp/rdpset.h>
+#include <freerdp/settings.h>
 #include <freerdp/utils/memory.h>
 
 #include "credssp.h"
@@ -50,7 +50,7 @@ asn1_write(const void *buffer, size_t size, void *fd)
 void credssp_ntlmssp_init(rdpCredssp *credssp)
 {
 	NTLMSSP *ntlmssp = credssp->ntlmssp;
-	rdpSet *settings = credssp->net->rdp->settings;
+	rdpSettings *settings = credssp->net->rdp->settings;
 
 	ntlmssp_set_password(ntlmssp, settings->password);
 	ntlmssp_set_username(ntlmssp, settings->username);