Changed signal names according to guidelines