Renaming and clarity fixes