Fix inconsistent prefix, cleaner example code