rename commands as XCommand and sum up use statements