sfa tags naming scheme now relies on master again