8 files changed, 30 insertions, 30 deletions
diff --git a/fpm/app/main.f90 b/fpm/app/main.f90
index 30abf5b..7f0f425 100644
--- a/fpm/app/main.f90
+++ b/fpm/app/main.f90
@@ -1,5 +1,5 @@
 program main
-use command_line, only: &
+use fpm_command_line, only: &
         fpm_cmd_settings, &
         fpm_new_settings, &
         fpm_build_settings, &
diff --git a/fpm/src/fpm.f90 b/fpm/src/fpm.f90
index 0d1e851..cd30db2 100644
--- a/fpm/src/fpm.f90
+++ b/fpm/src/fpm.f90
@@ -1,9 +1,9 @@
 module fpm
-use FPM_Strings
-use environment, only: run, get_os_type, OS_LINUX, OS_MACOS, OS_WINDOWS
-use FPM_Filesystem, only: number_of_rows, list_files, exists
-use FPM_Sourcefiles
-use FPM_Backend
+use fpm_strings
+use fpm_environment, only: run, get_os_type, OS_LINUX, OS_MACOS, OS_WINDOWS
+use fpm_filesystem, only: number_of_rows, list_files, exists
+use fpm_sources
+use fpm_backend
 implicit none
 private
 public :: cmd_build, cmd_install, cmd_new, cmd_run, cmd_test
diff --git a/fpm/src/FPM_Backend.f90 b/fpm/src/fpm_backend.f90
index d0aaa19..7394be9 100644
--- a/fpm/src/FPM_Backend.f90
+++ b/fpm/src/fpm_backend.f90
@@ -1,7 +1,7 @@
-module FPM_Backend
-use FPM_Strings
-use FPM_Model
-use environment
+module fpm_backend
+use fpm_strings
+use fpm_environment
+use fpm_sources
 implicit none
 
 
@@ -46,4 +46,4 @@ recursive subroutine build_source(source_file,linking)
 
 end subroutine build_source
 
-end module FPM_Backend
-\ No newline at end of file
+end module fpm_backend
+\ No newline at end of file
diff --git a/fpm/src/command_line.f90 b/fpm/src/fpm_command_line.f90
index cd78904..9902110 100644
--- a/fpm/src/command_line.f90
+++ b/fpm/src/fpm_command_line.f90
@@ -1,5 +1,5 @@
-module command_line
-    use environment, only: get_os_type, OS_LINUX, OS_MACOS, OS_WINDOWS
+module fpm_command_line
+    use fpm_environment, only: get_os_type, OS_LINUX, OS_MACOS, OS_WINDOWS
 
     implicit none
     private
@@ -75,4 +75,4 @@ contains
         print *, "    run      Run a binary of the local package (not implemented)"
         print *, "    test     Run the tests (not implemented)"
     end subroutine
-end module command_line
+end module fpm_command_line
diff --git a/fpm/src/environment.f90 b/fpm/src/fpm_environment.f90
index 23cd8aa..5ef7e18 100644
--- a/fpm/src/environment.f90
+++ b/fpm/src/fpm_environment.f90
@@ -1,4 +1,4 @@
-module environment
+module fpm_environment
     implicit none
     private
 
@@ -61,6 +61,6 @@ contains
             print *, "Command failed"
             error stop
         end if
-    end subroutine
+    end subroutine run
 
-end module
+end module fpm_environment
diff --git a/fpm/src/FPM_Filesystem.f90 b/fpm/src/fpm_filesystem.f90
index cc0487d..2b2793a 100644
--- a/fpm/src/FPM_Filesystem.f90
+++ b/fpm/src/fpm_filesystem.f90
@@ -1,6 +1,6 @@
-module FPM_Filesystem
-use FPM_Strings
-use environment, only: get_os_type, OS_LINUX, OS_MACOS, OS_WINDOWS
+module fpm_filesystem
+use fpm_strings
+use fpm_environment, only: get_os_type, OS_LINUX, OS_MACOS, OS_WINDOWS
 implicit none
 
 private
@@ -23,7 +23,7 @@ integer function number_of_rows(s) result(nrows)
         nrows = nrows + 1
     end do
     rewind(s)
-end function
+end function number_of_rows
 
 
 function read_lines(fh) result(lines)
@@ -74,7 +74,7 @@ subroutine list_files(dir, files)
     files = read_lines(fh)
     close(fh,status="delete")
 
-end subroutine
+end subroutine list_files
 
 
 logical function exists(filename) result(r)
@@ -122,4 +122,4 @@ function get_temp_filename() result(tempfile)
 end function get_temp_filename
 
 
-end module FPM_Filesystem
-\ No newline at end of file
+end module fpm_filesystem
+\ No newline at end of file
diff --git a/fpm/src/FPM_Sourcefiles.f90 b/fpm/src/fpm_sources.f90
index b613423..64dfcdc 100644
--- a/fpm/src/FPM_Sourcefiles.f90
+++ b/fpm/src/fpm_sources.f90
@@ -1,6 +1,6 @@
-module FPM_Sourcefiles
-use FPM_Strings
-use FPM_Filesystem, only: read_lines
+module fpm_sources
+use fpm_strings
+use fpm_filesystem, only: read_lines
 implicit none
 
 private
@@ -372,4 +372,4 @@ end subroutine resolve_dependencies
 
 
 
-end module FPM_Sourcefiles
-\ No newline at end of file
+end module fpm_sources
+\ No newline at end of file
diff --git a/fpm/src/FPM_Strings.f90 b/fpm/src/fpm_strings.f90
index 7ca88e2..09fa3c0 100644
--- a/fpm/src/FPM_Strings.f90
+++ b/fpm/src/fpm_strings.f90
@@ -1,4 +1,4 @@
-module FPM_Strings
+module fpm_strings
 implicit none
 
 type string_t
@@ -17,7 +17,7 @@ logical function str_ends_with(s, e) result(r)
     else
         r = (s(n1:n2) == e)
     end if
-end function
+end function str_ends_with
 
 function f_string(c_string)
     use iso_c_binding
@@ -192,4 +192,4 @@ subroutine split(input_line,array,delimiters,order,nulls)
 end subroutine split
 
 
-end module FPM_Strings
-\ No newline at end of file
+end module fpm_strings
+\ No newline at end of file