All names in lib changed to have +_+, some validations added