TX tweaks and renaming classes