Use full name of constant instead of DS