Fixed naming conventions and changed new classes to internal since we shouldn't expose these publicly (they are already legacy)
updated some legacy references