changes to naming and structure