Fix incorrect names and style issues