Functions now have standard names, additional fixes for cloud