Refactor tagging to follow storage standards