Refactoring static field names...