updates to naming and stuff