Docblock and internal naming changes