Internal_* -> _* (because now such classes are used a lot in the core, it was annoyingly verbose)