Rename statics to constants