renamed inner classes