Rename class and partial 'controlbar'