Changed naming to be consistent.