Clean-up.
Changed naming sheme for heavily used classes.