Better pk names