Improve names, account for command blocks