more naming cleanup
added deployment layer