shortened some internal class names