Merge "Fix /submit_type to return only uppercase names"