Fix naming and comments