Fix some bugs in eparcel code

Fix incorrect class name
Fix missing code