Cleaned up naming conventions in blockdev