Added 32bit templates + rename RHEL templates