Added aliases suggested by @santacruz123
fixes #2433
Added aliases suggested by @lucasuyezu
fixes #2493