Prefix geometry names with type