Removed duplicates from merge and removed camelCase from modules again.