Cleaned up some naming issues