minor method and type reference renames