Fix basic conventions