Remove unnecessary prefixes from Value Type constants

Reviewer: @vaterlaus