Special fields; naming refactor