Changed some names of inner classes