Changed order to type/ident/name

Changed order to type/ident/name  rather than type/name/ident for
consistency's sake