Improve naming
Update use of bashmenot