Revert "more renaming"

This reverts commit 3299eb41d6e2c02c192c1a5c772982cb2b39deb0.
Revert "More BTSX(T) -> BTS renaming"

This reverts commit 8d61588cd591e7ee4f36e24a83b868a13d99bfb9.