cleaned up naming convention a bit