Updating references to follow pattern.