Re-named redundant module files