Renaming corrections and module setup