Fixing build error and getting rid of capital S