Complete prefixing geometry names with type