Reverted naming changes