Fixed wrong and misleading naming