Added %name, and removed some _.