DAR-2106 | Fixes for DAR-2106

Just a few renames that were left.