ticket:5 for #5 fixing app names convention for stage fixup