- renamed innerClass names