fixed up naming scheme