Fixed misleading naming convention