general updates to naming