Yes it should...but there are lots of _ in the templates in Identity. Will try to get this cleaned up in a separate PR.