Coding naming updates