Revert "Changed command prefixes and added -leave"

This reverts commit 59b8184f0e49363448493c2098e9733c538a3cc8.