Added isTa check, rename duplicate files.