diff --git a/bacnet-stack/demo/object/msi.c b/bacnet-stack/demo/object/ms-input.c
similarity index 100%
rename from bacnet-stack/demo/object/msi.c
rename to bacnet-stack/demo/object/ms-input.c
diff --git a/bacnet-stack/include/msi.h b/bacnet-stack/include/ms-input.h
similarity index 98%
rename from bacnet-stack/include/msi.h
rename to bacnet-stack/include/ms-input.h
index 06da4fa0..6d371f04 100644
--- a/bacnet-stack/include/msi.h
+++ b/bacnet-stack/include/ms-input.h
@@ -22,8 +22,8 @@
 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 *
 *********************************************************************/
-#ifndef MSI_H
-#define MSI_H
+#ifndef MS_INPUT_H
+#define MS_INPUT_H
 
 #include <stdbool.h>
 #include <stdint.h>