rename consistantly, add bower