Shortening Class names a little