Fix: confusing naming + remove warning.