Cleanup

Changed the name as the modules may be used in munki or other systems.