Refactor collection names to "standard"