fixing mixed up naming