Fix `p`
Add `empty_name_graph` and `empty_name_to_command` and use them