add name strictness and dry up