Updating for consistent naming across Timber