fix names convention