Add single char generator and change names