fixes #24 plural vs single naming convention