Removed internal class names

Changed my mind, we don't need to expose them