Minor fixes after renaming module