Made the naming convention a bit more consistent.