Clarify domain / bucket naming