Matching conventions and constants fix