Compile fixes
Type rename. This completes renaming stuff, for now.