naming fixes and remove echo