(CODE BREAKING CHANGE) -> Change "Injector" to "Locator" to match design pattern name, and some misc tweaks.