UML-184: Fix copy/paste issues