Remove unnecessary usage of `echo`
Replace `create-` prefix with nothing
Remove test variables