Tweaking spec names
Removing old file, renaming one to match naming conventions
Caching address and touching enterprise on save