RPV-203 - Removed redundant box and unit name