Refactor names, better build release script