more naming changes to match the layout