Standardized a single convention across project