fix names and placement