Feature name now takes over as well