rename variables within rosconsole macros (ros/ros_comm#442)