New name, and fixed e command conflict