#16 change and clean names