files rename/cleanup (+ dropped inflatePrime method)