Removed 'NoJPF' postfix from cloud demo classes