made function names more consistant