Merge "Several renames for consistency. Should help with fragmentizing afterwards"