Rename active-class; fix