Renaming and fixes.