Moved utils to shared where appropriate; fixed naming