Revert "Changed back 2 to 2T and modify atom type in the group."

This reverts commit cc46b41cc3a7d940dfb17eb0d8b31ef27971cbd9.