update / naming correction