Fixes #3227 - restore app options names