Changed to remove the prefix from EDM generation out of Bean