Renaming and more fixes.