Use plural component names