Fixed full/short_name property names