Changed Functions Name

Changed Functions Name To more generic once