Removed "rastapop" suffix and fixed build