Reverted sfbay rename