Avoid using k prefix for constants

Update for constants naming