renamed all serializable classes