Few renames and cleanup