Changed name declarations to make it work in min