Fixes plural naming issue