Fix naming formats
Move HP Calulation function to model