Cleaned up some naming