Renamed internals; Area is now Locator to prevent namespace conflicts.