Naming consistency and chaining fix.