Changes from Fixed invalid naming pattern error.