Cleaned up some naming.