Refactored the minecart entities for naming convention