Changed class names

Look and changes