Refactored to new gmf editor naming