fixed a problem with naming