Changed names to fit better