rename neighborhood class to keep consistent names