LERPing and further naming convention update