fixes #25 plural vs single naming conventions