Type names changed to capps