Changing command names to reflect entity change