unify engine to not require the suffix (as Cache and other places do).