Changed namespace and name of Functions