correct re-assignment of static assignments
rename matching static method in DS
Merge pull request #2704 from birarda/master

correct the re-assignment of static assignments