remoing stupid names
adding sane names