Bit more naming consistency