rename enum, remove obsolete dependency