Fix up to handle environment naming