Renamed blocks to camel case