Changing naming and construction convention